(global-font-lock-mode): Enable `global-font-lock-mode' by default,

except in batch mode or when the -D command line option is given.

diff --git a/lisp/font-core.el b/lisp/font-core.el
index 27212f9fc6823a02c3a390e5f82f384244ec0a1e..22311fd1e74fdf2009ac4476f884803bbc50c6ae 100644 (file)
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -293,7 +293,9 @@ means that Font Lock mode is turned on for buffers in C and C++ modes only."
 
 (easy-mmode-define-global-mode
  global-font-lock-mode font-lock-mode turn-on-font-lock-if-enabled
- :extra-args (dummy))
+ :extra-args (dummy)
+ :initialize 'custom-initialize-safe-default
+ :init-value (not (or noninteractive emacs-basic-display)))
 
 ;;; End of Global Font Lock mode.